From: Boyuan Yang <073plan@gmail.com> Date: Mon, 9 Oct 2017 14:00:47 +0000 (+0800) Subject: debian: Prepare new release 1.0.5-1. X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~185 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=96a0cfaffc317922fc9dac0116dcb25660e686ce;p=opencc.git debian: Prepare new release 1.0.5-1. --- diff --git a/debian/changelog b/debian/changelog index f41c949..4b14d95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +opencc (1.0.5-1) unstable; urgency=medium + + * Team upload. + * New upstream Release. + * Remove libopencc2 M-A:same mark for now since ocd files exist. + (Closes: #874227) + * Remove LI Daobing from Uploaders list. (Closes: #841792) + Thank you for your previous work! + * d/patches: Refresh patches. + * d/control: Use canonical Vcs URL. + * d/control: Bump Standards-Version to 4.1.1. + * d/control: Bump debhelper compat to v10. + + -- Boyuan Yang <073plan@gmail.com> Mon, 09 Oct 2017 22:06:50 +0800 + opencc (1.0.4-4) unstable; urgency=medium * Tighter Breaks/Conflicts version (Closes: #847145) diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index d8611a8..b5a6008 100644 --- a/debian/control +++ b/debian/control @@ -1,24 +1,23 @@ Source: opencc Priority: optional Maintainer: IME Packaging Team -Uploaders: LI Daobing , - Asias He , +Uploaders: Asias He , YunQiang Su , Osamu Aoki , Aron Xu Build-Depends: cmake, darts, - debhelper (>= 9), + debhelper (>= 10), doxygen, libjs-jquery, libtclap-dev, python, rapidjson-dev -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 Section: libs Homepage: https://github.com/BYVoid/OpenCC -Vcs-Git: git://anonscm.debian.org/pkg-ime/opencc.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ime/opencc.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ime/opencc.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-ime/opencc.git Package: opencc Section: utils @@ -33,7 +32,6 @@ Description: simplified-traditional Chinese conversion tool Package: libopencc2 Architecture: any -Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libopencc2-data Description: simplified-traditional Chinese conversion library - runtime @@ -45,7 +43,6 @@ Description: simplified-traditional Chinese conversion library - runtime Package: libopencc-dev Section: libdevel Architecture: any -Multi-Arch: same Depends: libjs-jquery, libopencc2 (= ${binary:Version}), ${misc:Depends} Description: simplified-traditional Chinese conversion library - development opencc is a library for converting character between traditional Chinese and diff --git a/debian/patches/lib-name-match-soversion.patch b/debian/patches/lib-name-match-soversion.patch index 26fd8f7..98e9437 100644 --- a/debian/patches/lib-name-match-soversion.patch +++ b/debian/patches/lib-name-match-soversion.patch @@ -1,10 +1,17 @@ -Subject: make sure library name matches soname From: Aron Xu -Index: opencc/src/CMakeLists.txt +Date: Mon, 9 Oct 2017 22:02:39 +0800 +Subject: make sure library name matches soname + =================================================================== ---- opencc.orig/src/CMakeLists.txt -+++ opencc/src/CMakeLists.txt -@@ -72,7 +72,7 @@ set_target_properties( +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 498a4f6..6e36db1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,7 +75,7 @@ set_target_properties( OUTPUT_NAME opencc VERSION diff --git a/debian/patches/use-cmake-install-libdir.patch b/debian/patches/use-cmake-install-libdir.patch index 31e6670..3dcdec0 100644 --- a/debian/patches/use-cmake-install-libdir.patch +++ b/debian/patches/use-cmake-install-libdir.patch @@ -1,11 +1,20 @@ -Index: opencc/CMakeLists.txt +From: IME Packaging Team +Date: Mon, 9 Oct 2017 22:02:39 +0800 +Subject: use-cmake-install-libdir + =================================================================== ---- opencc.orig/CMakeLists.txt -+++ opencc/CMakeLists.txt -@@ -69,7 +69,7 @@ set (DIR_INCLUDE ${DIR_PREFIX}/include/) +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a29415..abbac00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,7 +68,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) + set (DIR_INCLUDE ${DIR_PREFIX}/include/) set (DIR_SHARE ${DIR_PREFIX}/share/) set (DIR_ETC ${DIR_PREFIX}/etc/) - set (LIB_SUFFIX "") -set (DIR_LIBRARY ${DIR_PREFIX}/lib${LIB_SUFFIX}/) +set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR}) diff --git a/debian/patches/use-system-libraries.patch b/debian/patches/use-system-libraries.patch index 1edb1ca..0d31e5a 100644 --- a/debian/patches/use-system-libraries.patch +++ b/debian/patches/use-system-libraries.patch @@ -1,7 +1,16 @@ -Index: opencc/src/CMakeLists.txt +From: IME Packaging Team +Date: Mon, 9 Oct 2017 22:02:39 +0800 +Subject: use-system-libraries + =================================================================== ---- opencc.orig/src/CMakeLists.txt -+++ opencc/src/CMakeLists.txt +--- + src/CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6e36db1..299a062 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -1,8 +1,7 @@ include (GenerateExportHeader) diff --git a/debian/rules b/debian/rules index af50c7c..8be8925 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f + export DEB_BUILD_MAINT_OPTIONS = hardening=+all -DPKG_EXPORT_BUILDFLAGS = 1 --include /usr/share/dpkg/buildflags.mk + # CMake doesn't use CPPFLAGS, pass them to CFLAGS/CXXFLAGS to enable the # missing (hardening) flags. CFLAGS += $(CPPFLAGS) @@ -9,7 +9,7 @@ CFLAGS += $(CPPFLAGS) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: - dh $@ --buildsystem=cmake --parallel + dh $@ --buildsystem=cmake override_dh_auto_configure: dh_auto_configure -- \